From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 21 May 2008 09:57:08 +0000 (+0100)
Subject: xend: Remove XendLogging dependency from a couple of generally useful
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14210^2~10
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=da61293b33e0aa3cbd879ec21a11c096f657a620;p=xen.git

xend: Remove XendLogging dependency from a couple of generally useful
support modules.

Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
---

diff --git a/tools/python/xen/util/blkif.py b/tools/python/xen/util/blkif.py
index 0fdd52f418..beac3dc634 100644
--- a/tools/python/xen/util/blkif.py
+++ b/tools/python/xen/util/blkif.py
@@ -2,8 +2,6 @@ import os
 import re
 import string
 
-from xen.xend.XendLogging import log
-
 def expand_dev_name(name):
     if not name:
         return name
diff --git a/tools/python/xen/xend/xenstore/xswatch.py b/tools/python/xen/xend/xenstore/xswatch.py
index a1ea740a94..04651686fd 100644
--- a/tools/python/xen/xend/xenstore/xswatch.py
+++ b/tools/python/xen/xend/xenstore/xswatch.py
@@ -9,8 +9,6 @@ import errno
 import threading
 from xen.xend.xenstore.xsutil import xshandle
 
-from xen.xend.XendLogging import log
-
 
 class xswatch:
 
@@ -76,7 +74,7 @@ def watchMain():
                     else:
                         raise
         except:
-            log.exception("read_watch failed")
+            pass
             # Ignore this exception -- there's no point throwing it
             # further on because that will just kill the watcher thread,
             # which achieves nothing.